(cherry picked from commit 85da515)

(cherry picked from commit c8657ba)

(cherry picked from commit 94ab08a)

(cherry picked from commit 5522282)

(cherry picked from commit 282d6a0)

(cherry picked from commit e87de21)

(cherry picked from commit 2d66e9e)

(cherry picked from commit bddf920)

(cherry picked from commit 645ba02)

(cherry picked from commit 3067a30)
(cherry picked from commit f996cad)

(cherry picked from commit 3dbb13a)
(cherry picked from commit 91104e1)

(cherry picked from commit fe1d4ab)
(cherry picked from commit b3df977)

(cherry picked from commit e8bbd83)
(cherry picked from commit 754e868)

(cherry picked from commit 8e8d09d)
(cherry picked from commit b900f11)